Merge tag 'upstream/2.3'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 10 Aug 2014 20:23:26 +0000 (23:23 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 10 Aug 2014 20:23:26 +0000 (23:23 +0300)
commitb3cafc88a489a1a0c325b7d39cd9756a79351cae
treeba5f77a8407eb0ad3f51d5ec989c04d3204e43b4
parentdd16a7f85e69a1d9fc336cb80a2ecfc253d6f50c
parent7dcdf2ec6e23faf605926edaa1d2977c6741d95d
Merge tag 'upstream/2.3'

Upstream version 2.3

Conflicts:
CMakeLists.txt